Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Jan 2012 19:31:34 +0000 (11:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 Jan 2012 19:31:34 +0000 (11:31 -0800)
commit8dbb0ae000b160f473e00b62a012fbac088dce18
tree780fad981c75d1cae204f553669e8760dbb08e83
parentde37c083c2d156f801092ba88d3ea664a62b96fc
parent1f48de2bbf78c87c1dee6425181b31be60d39c7c
Merge from trunk.